Auto merge of #3568 - alexcrichton:fix-small, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 20 Jan 2017 16:51:03 +0000 (16:51 +0000)
committerbors <bors@rust-lang.org>
Fri, 20 Jan 2017 16:51:03 +0000 (16:51 +0000)
commitf4754f5dd326c5cc2d01c8abaede9496d73a0842
tree022585866d79ab038f571d3d195d22adc99cec4b
parent1eb600d59c405dcfbe5c12bb00f9fd4baa333ea6
parent41accdfd03666404a1b95cc4e070877c84e15033
Auto merge of #3568 - alexcrichton:fix-small, r=alexcrichton

Update travis token and fix warning